From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 23 Aug 2018 16:35:43 +0000 (-0300)
Subject: switcherPopup: Use MonitorConstraint instead of vfunc overrides
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~897^2~1^2~106
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0ec36fc5cfd37e573e848f0eb75390c75fafbe4a;p=gnome-shell.git

switcherPopup: Use MonitorConstraint instead of vfunc overrides

Instead of overriding vfunc_get_preferred_width|height(), use the
already available Layout.MonitorConstraint to bind SwitcherPopup
to the primary monitor.
---

diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js
index 4b1d89e76..ad77787cf 100644
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@@ -10,6 +10,7 @@ const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
 
+const Layout = imports.ui.layout;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
@@ -63,21 +64,13 @@ var SwitcherPopup = new Lang.Class({
         this._initialDelayTimeoutId = 0;
         this._noModsTimeoutId = 0;
 
+        this.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+
         // Initially disable hover so we ignore the enter-event if
         // the switcher appears underneath the current pointer location
         this._disableHover();
     },
 
-    vfunc_get_preferred_width(forHeight) {
-        let primary = Main.layoutManager.primaryMonitor;
-        return [primary.width, primary.width];
-    },
-
-    vfunc_get_preferred_height(forWidth) {
-        let primary = Main.layoutManager.primaryMonitor;
-        return [primary.height, primary.height];
-    },
-
     vfunc_allocate(box, flags) {
         this.set_allocation(box, flags);